debian-opt

Gbp-Pq: Name debian-opt.diff

diff --git a/configure.in b/configure.in
index d01e82ff8f1895e7a8f0ae762894319e33f7cc98..0db6452e63f4a67226e5f52886ed896eafec3fc1 100644 (file)
Binary files a/configure.in and b/configure.in differ

diff --git a/set_soenv.in b/set_soenv.in
index a8561cd64d9940f6b492dfbf419b427ee2d01bc8..e3d48a18e672ef258440e7f3f6ffc387645d520e 100755 (executable)
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1568,6 +1568,7 @@ ToFile( "COM",               $COM,               "e" );
 ToFile( "COMPATH",           $COMPATH,           "e" );
 ToFile( "CPU",               $CPU,               "e" );
 ToFile( "CPUNAME",           $CPUNAME,           "e" );
+ToFile( "CDEFAULTOPT",       "@CDEFAULTOPT@",    "e" );
 ToFile( "GUI",               $GUI,               "e" );
 ToFile( "GUIBASE",           $GUIBASE,           "e" );
 ToFile( "GVER",              $GVER,              "e" );

diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index a3231a69d7d61ffb17b89218223f5751ffe593a1..0041a586727981f77a462f20c22cfce2adeba1cc 100644 (file)
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -31,7 +31,7 @@ ASM*=
 AFLAGS*=
 SOLAR_JAVA*=
 # default optimization level for product code
-CDEFAULTOPT*=-O2
+CDEFAULTOPT*=$(shell dpkg-buildflags --get CFLAGS 2>/dev/null | $(GREP) -E -o "\-O[0-3]" || echo "-O2")
 # architecture dependent flags for the C and C++ compiler that can be changed by
 # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
 ARCH_FLAGS*=

diff --git a/solenv/inc/unxlngi.mk b/solenv/inc/unxlngi.mk
index 79c255c326a265681be78cd677ce2901af44c99d..40ff07d59472dc173f2ce6cfb46f2fc7c7b8eea8 100644 (file)
--- a/solenv/inc/unxlngi.mk
+++ b/solenv/inc/unxlngi.mk
@@ -26,7 +26,6 @@
 #*************************************************************************
 
 # mk file for Unix Linux Intel (X86) using GCC, please make generic modifications to unxlng.mk
-CDEFAULTOPT=-Os
 .IF "$(GCCNUMVER)" >= "000400050000"
 ARCH_FLAGS*=-mtune=atom
 .ELSE

diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk
index b6a018a10a1dcf2ae7af86766e0cd5a49f8e099b..0d308ec75a960e0c7ad653e1e257dc46d5d6875d 100644 (file)
--- a/solenv/inc/unxlngm68k.mk
+++ b/solenv/inc/unxlngm68k.mk
@@ -27,7 +27,6 @@
 
 # mk file for Unix Linux m68k using GCC, please make generic modifications to unxlng.mk
 
-CDEFAULTOPT=-Os
 PICSWITCH:=-fPIC
 .INCLUDE : unxlng.mk
 CDEFS+=-DM68K

diff --git a/solenv/inc/unxlngmips.mk b/solenv/inc/unxlngmips.mk
index 783305d6c9d18c1fa33e8709aa6591009ad0bc71..2e47da2c4fee55d9bb433b6eef600edb707a09eb 100644 (file)
--- a/solenv/inc/unxlngmips.mk
+++ b/solenv/inc/unxlngmips.mk
@@ -27,6 +27,5 @@
 
 # mk file for Unix Linux Mips using GCC, please make generic modifications to unxlng.mk
 
-CDEFAULTOPT=-Os
 .INCLUDE : unxlng.mk
 CDEFS+=-DMIPS

diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk
index 81ee90ca4f0edd7064265e49c5c748562d29e6a5..c855716980ed919c25027cfec954b92b2bc39120 100644 (file)
--- a/solenv/inc/unxlngr.mk
+++ b/solenv/inc/unxlngr.mk
@@ -27,7 +27,6 @@
 
 # mk file for Unix Linux ARM using GCC, please make generic modifications to unxlng.mk
 
-CDEFAULTOPT=-Os
 .INCLUDE : unxlng.mk
 CDEFS+=-DARM32
 CFLAGS+=-fno-omit-frame-pointer

diff --git a/solenv/inc/unxlngs.mk b/solenv/inc/unxlngs.mk
index 390244f31d6c04fa6b4a30c82037a7cf0003e020..9827c22a725f8e99822cc85dc4f89ddc0629caae 100644 (file)
--- a/solenv/inc/unxlngs.mk
+++ b/solenv/inc/unxlngs.mk
@@ -29,7 +29,6 @@
 
 ASM=$(CC)
 AFLAGS=-Wa,-K,PIC -c $(CDEFS)
-CDEFAULTOPT=-Os
 PICSWITCH:=-fPIC
 .INCLUDE : unxlng.mk
 CDEFS+=-DSPARC